Implementation of: fluxcd/flux2#5321

Closes: #1097

Use Cases

 apiVersion: notification.toolkit.fluxcd.io/v1beta3
 kind: Provider
 metadata:
   name: jaeger
   namespace: flux-system
 spec:
   type: otel
   address: http://jaeger-collector.jaeger:4318/v1/traces

• GitRepository -> Kustomization -> ConfigMap

   apiVersion: notification.toolkit.fluxcd.io/v1beta3
   kind: Alert
   metadata:
     name: alert-test-1
     namespace: flux-system
   spec:
     # summary: "Flagger impacted in us-east-2"
     providerRef:
       name: jaeger
     # eventSeverity: error
     eventSources:
       - kind: GitRepository
         name: '*'
         namespace: test-1
       - kind: Kustomization
         name: '*'
         namespace: test-1
     eventMetadata:
       env: staging
       cluster: cluster-1
       region: eu-west-1
  

   apiVersion: v1
   kind: Secret
   metadata:
     name: test-repo-secret
     namespace: test-1
   data:
     username: Z29ncw==
     password: Z29ncw==
   ---
   apiVersion: source.toolkit.fluxcd.io/v1
   kind: GitRepository
   metadata:
     name: test-repo
     namespace: test-1
   spec:
     interval: 5m0s
     url: http://gogs-svc.gogs:18080/gogs/test-1
     ref:
       branch: master
     secretRef:
       name: test-repo-secret
   ---
   apiVersion: kustomize.toolkit.fluxcd.io/v1
   kind: Kustomization
   metadata:
     name: podinfo
     namespace: test-1
     annotations:
       event.toolkit.fluxcd.io/summary: "Reconcile ConfigMaps: cm-1 & cm-2"
   spec:
     interval: 10m
     sourceRef:
       kind: GitRepository
       name: test-repo
     path: "."
     prune: true
     timeout: 1m
  

  

• OCIRepository > HelmRelease

   apiVersion: notification.toolkit.fluxcd.io/v1beta3
   kind: Alert
   metadata:
     name: alert-test-2
     namespace: flux-system
   spec:
     providerRef:
       name: jaeger
     eventSources:
       - kind: OCIRepository
         name: '*'
         namespace: test-2
       - kind: HelmRelease
         name: '*'
         namespace: test-2
     eventMetadata:
       env: staging
       cluster: cluster-1
       region: us-east-1
  

   apiVersion: source.toolkit.fluxcd.io/v1
   kind: OCIRepository
   metadata:
     name: podinfo-repo
     namespace: test-2
   spec:
     interval: 5m0s
     url: oci://ghcr.io/stefanprodan/charts/podinfo
     ref:
       semver: ">= 6.0.0"
   ---
   apiVersion: helm.toolkit.fluxcd.io/v2
   kind: HelmRelease
   metadata:
     name: podinfo-1
     namespace: test-2
     annotations:
       event.toolkit.fluxcd.io/summary: "Test-2: staging env, cluster-1 & us-east-1"
       event.toolkit.fluxcd.io/deploymentID: podinfo-1
   spec:
     interval: 10m
     chartRef:
       kind: OCIRepository
       name: podinfo-repo
     values:
       replicaCount: 2
   ---
   apiVersion: helm.toolkit.fluxcd.io/v2
   kind: HelmRelease
   metadata:
     name: podinfo-2
     namespace: test-2
     annotations:
       event.toolkit.fluxcd.io/summary: "Test-2: staging env, cluster-1 & us-east-1"
       event.toolkit.fluxcd.io/deploymentID: podinfo-2
   spec:
     interval: 10m
     chartRef:
       kind: OCIRepository
       name: podinfo-repo
     values:
       replicaCount: 2
   ---
   apiVersion: helm.toolkit.fluxcd.io/v2
   kind: HelmRelease
   metadata:
     name: podinfo-3
     namespace: test-2
     annotations:
       event.toolkit.fluxcd.io/summary: "Test-2: staging env, cluster-1 & us-east-1"
       event.toolkit.fluxcd.io/deploymentID: podinfo-3
   spec:
     interval: 10m
     chartRef:
       kind: OCIRepository
       name: podinfo-repo
     values:
       replicaCount: 2
  

  However, looks like `OCIRepository` and `HelmRelease` collection is created as different spans due to having a different naming conventions to populate the revision:
  • OCIRepository
    - revision: 6.9.1@sha256:565d310746f1fa4be7f93ba7965bb393153a2d57a15cfe5befc909b790a73f8a
  • HelmRelease
    - revision: 6.9.1+565d310746f1
    - oci-digest: sha256:565d310746f1fa4be7f93ba7965bb393153a2d57a15cfe5befc909b790a73f8a
    - app-version: 6.9.1

• HelmChart -> HelmReleases

  apiVersion: notification.toolkit.fluxcd.io/v1beta3
  kind: Alert
  metadata:
    name: alert-test-3
    namespace: flux-system
  spec:
    # summary: "Flagger impacted in us-east-2"
    providerRef:
      name: jaeger
    # eventSeverity: error
    eventSources:
      - kind: HelmChart
        name: '*'
        namespace: test-3
      - kind: HelmRelease
        name: '*'
        namespace: test-3
    eventMetadata:
      env: staging
      cluster: cluster-3
      region: us-west-1
  

  apiVersion: source.toolkit.fluxcd.io/v1
  kind: HelmRepository
  metadata:
    name: podinfo
    namespace: test-3
  spec:
    interval: 5m0s
    url: https://stefanprodan.github.io/podinfo
  ---
  apiVersion: source.toolkit.fluxcd.io/v1
  kind: HelmChart
  metadata:
    name: podinfo
    namespace: test-3
  spec:
    interval: 5m0s
    chart: podinfo
    reconcileStrategy: ChartVersion
    sourceRef:
      kind: HelmRepository
      name: podinfo
    version: '5.*'
  ---
  apiVersion: helm.toolkit.fluxcd.io/v2
  kind: HelmRelease
  metadata:
    name: podinfo-1
    namespace: test-3
  spec:
    interval: 10m
    timeout: 5m
    chartRef:
      kind: HelmChart
      name: podinfo
    install:
      remediation:
        retries: 3
    upgrade:
      remediation:
        retries: 3
    test:
      enable: true
  ---
  apiVersion: helm.toolkit.fluxcd.io/v2
  kind: HelmRelease
  metadata:
    name: podinfo-2
    namespace: test-3
  spec:
    interval: 10m
    timeout: 5m
    chartRef:
      kind: HelmChart
      name: podinfo
    install:
      remediation:
        retries: 3
    upgrade:
      remediation:
        retries: 3
    test:
      enable: true
  

  

Part of: #1097
Part of: fluxcd/flux2#5321